macro and GtkType fixups.

Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkdialog.h:
        * gtk/gtkseparator.h:
        * gtk/gtkhseparator.h:
        * gtk/gtkvseparator.h: macro and GtkType fixups.

diff --git a/ChangeLog b/ChangeLog
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d00e2a4c2a3bb9377e83eeaae9bcd8e8bd629f49..a3a1d27bea697c6621374041a00c1b9500af86e0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkdialog.h: 
+       * gtk/gtkseparator.h: 
+       * gtk/gtkhseparator.h: 
+       * gtk/gtkvseparator.h: macro and GtkType fixups.
+
 Tue Jul 14 06:25:46 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/testgtk.c (create_cursors): display the current cursor name.

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 670c82487fcd668a2656fc5b90a0599f57d0efd3..0e19e14bb2db72c55fc943eb5297a8084f80e53e 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -27,10 +27,10 @@ static void gtk_dialog_class_init (GtkDialogClass *klass);
 static void gtk_dialog_init       (GtkDialog      *dialog);
 
 
-guint
+GtkType
 gtk_dialog_get_type (void)
 {
-  static guint dialog_type = 0;
+  static GtkType dialog_type = 0;
 
   if (!dialog_type)
     {
@@ -46,7 +46,7 @@ gtk_dialog_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      dialog_type = gtk_type_unique (gtk_window_get_type (), &dialog_info);
+      dialog_type = gtk_type_unique (GTK_TYPE_WINDOW, &dialog_info);
     }
 
   return dialog_type;
@@ -79,5 +79,5 @@ gtk_dialog_init (GtkDialog *dialog)
 GtkWidget*
 gtk_dialog_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (gtk_dialog_get_type ()));
+  return GTK_WIDGET (gtk_type_new (GTK_TYPE_DIALOG));
 }

diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 6fdb5e61a627919a64a59118a2f76e244650de53..247f8227d8c1d65588b69a8216eda3db3418ecc2 100644 (file)
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -26,12 +26,15 @@
 
 #ifdef __cplusplus
 extern "C" {
+#pragma }
 #endif /* __cplusplus */
 
 
-#define GTK_DIALOG(obj)          GTK_CHECK_CAST (obj, gtk_dialog_get_type (), GtkDialog)
-#define GTK_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_dialog_get_type (), GtkDialogClass)
-#define GTK_IS_DIALOG(obj)       GTK_CHECK_TYPE (obj, gtk_dialog_get_type ())
+#define GTK_TYPE_DIALOG                  (gtk_dialog_get_type ())
+#define GTK_DIALOG(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_DIALOG, GtkDialog))
+#define GTK_DIALOG_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DIALOG, GtkDialogClass))
+#define GTK_IS_DIALOG(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_DIALOG))
+#define GTK_IS_DIALOG_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DIALOG))
 
 
 typedef struct _GtkDialog        GtkDialog;
@@ -53,7 +56,7 @@ struct _GtkDialogClass
 };
 
 
-guint      gtk_dialog_get_type (void);
+GtkType    gtk_dialog_get_type (void);
 GtkWidget* gtk_dialog_new      (void);
 
 

diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index ff6c7a0deefe65aca95dcc176b8c5999199fab6b..88cd4642f91dadf65ef82e22644dbe77138ac55a 100644 (file)
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -25,10 +25,10 @@ static gint gtk_hseparator_expose     (GtkWidget          *widget,
                                       GdkEventExpose     *event);
 
 
-guint
+GtkType
 gtk_hseparator_get_type (void)
 {
-  static guint hseparator_type = 0;
+  static GtkType hseparator_type = 0;
 
   if (!hseparator_type)
     {
@@ -44,7 +44,7 @@ gtk_hseparator_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      hseparator_type = gtk_type_unique (gtk_separator_get_type (), &hseparator_info);
+      hseparator_type = gtk_type_unique (GTK_TYPE_SEPARATOR, &hseparator_info);
     }
 
   return hseparator_type;
@@ -70,7 +70,7 @@ gtk_hseparator_init (GtkHSeparator *hseparator)
 GtkWidget*
 gtk_hseparator_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (gtk_hseparator_get_type ()));
+  return GTK_WIDGET (gtk_type_new (GTK_TYPE_HSEPARATOR));
 }
 
 

diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index 60f1b02d29ab70e131bcc4d29f5aee3a885f3cb3..0ca3aa28ac6f8fbbab3c3e5e7c098df6acee57ed 100644 (file)
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -26,12 +26,15 @@
 
 #ifdef __cplusplus
 extern "C" {
+#pragma }
 #endif /* __cplusplus */
 
 
-#define GTK_HSEPARATOR(obj)          GTK_CHECK_CAST (obj, gtk_hseparator_get_type (), GtkHSeparator)
-#define GTK_HSEPARATOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_hseparator_get_type (), GtkHSeparatorClass)
-#define GTK_IS_HSEPARATOR(obj)       GTK_CHECK_TYPE (obj, gtk_hseparator_get_type ())
+#define GTK_TYPE_HSEPARATOR                  (gtk_hseparator_get_type ())
+#define GTK_HSEPARATOR(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator))
+#define GTK_HSEPARATOR_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
+#define GTK_IS_HSEPARATOR(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_HSEPARATOR))
+#define GTK_IS_HSEPARATOR_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSEPARATOR))
 
 
 typedef struct _GtkHSeparator       GtkHSeparator;
@@ -48,13 +51,13 @@ struct _GtkHSeparatorClass
 };
 
 
-guint      gtk_hseparator_get_type (void);
+GtkType    gtk_hseparator_get_type (void);
 GtkWidget* gtk_hseparator_new      (void);
 
 
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-
 #endif /* __GTK_HSEPARATOR_H__ */

diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 8aa612391e2fba49e049e913c6eb167962df8ce6..e0a4a0e668c1a9aec3dd2410ff736a24a3aa11f3 100644 (file)
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -23,10 +23,10 @@ static void gtk_separator_class_init (GtkSeparatorClass *klass);
 static void gtk_separator_init       (GtkSeparator      *separator);
 
 
-guint
+GtkType
 gtk_separator_get_type (void)
 {
-  static guint separator_type = 0;
+  static GtkType separator_type = 0;
 
   if (!separator_type)
     {
@@ -42,7 +42,7 @@ gtk_separator_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      separator_type = gtk_type_unique (gtk_widget_get_type (), &separator_info);
+      separator_type = gtk_type_unique (GTK_TYPE_WIDGET, &separator_info);
     }
 
   return separator_type;

diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index 371d54a3fb40640911072536b75ca6b878c97dce..472274afb62fa2c1cbdb8a2128914362c9341c25 100644 (file)
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -26,12 +26,15 @@
 
 #ifdef __cplusplus
 extern "C" {
+#pragma }
 #endif /* __cplusplus */
 
 
-#define GTK_SEPARATOR(obj)          GTK_CHECK_CAST (obj, gtk_separator_get_type (), GtkSeparator)
-#define GTK_SEPARATOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_separator_get_type (), GtkSeparatorClass)
-#define GTK_IS_SEPARATOR(obj)       GTK_CHECK_TYPE (obj, gtk_separator_get_type ())
+#define GTK_TYPE_SEPARATOR                  (gtk_separator_get_type ())
+#define GTK_SEPARATOR(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
+#define GTK_SEPARATOR_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
+#define GTK_IS_SEPARATOR(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_SEPARATOR))
+#define GTK_IS_SEPARATOR_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
 
 
 typedef struct _GtkSeparator       GtkSeparator;
@@ -48,12 +51,11 @@ struct _GtkSeparatorClass
 };
 
 
-guint  gtk_separator_get_type (void);
+GtkType  gtk_separator_get_type (void);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-
 #endif /* __GTK_SEPARATOR_H__ */

diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index 6ebaef79b4909540678501f9119b3ee2dee3f94d..eb70f01af0230163e6e977abdf240f2bc49d8510 100644 (file)
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -25,10 +25,10 @@ static gint gtk_vseparator_expose     (GtkWidget          *widget,
                                       GdkEventExpose     *event);
 
 
-guint
+GtkType
 gtk_vseparator_get_type (void)
 {
-  static guint vseparator_type = 0;
+  static GtkType vseparator_type = 0;
 
   if (!vseparator_type)
     {
@@ -44,7 +44,7 @@ gtk_vseparator_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      vseparator_type = gtk_type_unique (gtk_separator_get_type (), &vseparator_info);
+      vseparator_type = gtk_type_unique (GTK_TYPE_SEPARATOR, &vseparator_info);
     }
 
   return vseparator_type;
@@ -70,7 +70,7 @@ gtk_vseparator_init (GtkVSeparator *vseparator)
 GtkWidget*
 gtk_vseparator_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (gtk_vseparator_get_type ()));
+  return GTK_WIDGET (gtk_type_new (GTK_TYPE_VSEPARATOR));
 }
 
 

diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index 73ffea50ddd0d0216e6df39c2f4000e2dfa3c7a7..eb051580f1b5b2108f9f8454c817435beeaa8d49 100644 (file)
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -24,9 +24,17 @@
 #include <gtk/gtkseparator.h>
 
 
-#define GTK_VSEPARATOR(obj)          GTK_CHECK_CAST (obj, gtk_vseparator_get_type (), GtkVSeparator)
-#define GTK_VSEPARATOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_vseparator_get_type (), GtkVSeparatorClass)
-#define GTK_IS_VSEPARATOR(obj)       GTK_CHECK_TYPE (obj, gtk_vseparator_get_type ())
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+
+#define GTK_TYPE_VSEPARATOR                  (gtk_vseparator_get_type ())
+#define GTK_VSEPARATOR(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparator))
+#define GTK_VSEPARATOR_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
+#define GTK_IS_VSEPARATOR(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_VSEPARATOR))
+#define GTK_IS_VSEPARATOR_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSEPARATOR))
 
 
 typedef struct _GtkVSeparator       GtkVSeparator;
@@ -43,18 +51,13 @@ struct _GtkVSeparatorClass
 };
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-guint      gtk_vseparator_get_type (void);
+GtkType    gtk_vseparator_get_type (void);
 GtkWidget* gtk_vseparator_new      (void);
 
 
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-
 #endif /* __GTK_SEPARATOR_H__ */